merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 25 Nov 2010 11:35:05 +0000 (20:35 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 25 Nov 2010 11:35:05 +0000 (20:35 +0900)
commit01bc892200a5f130380339211b5bb3be9434d4e3
tree846a3a2295cdddc27d9ea6f5cf1981c08820dfa1
parentdb817eb40c5a5d59646c73b89d6706218794ef02
parent87acc93e26f739376a5b9c249fb98bc7fd136bea
merge trunk